bitkeeper revision 1.1159.244.1 (4204932bmZgxudypIonkb5Mm9GmAtA)

Create arch_do_boot_vcpu().
Signed-off-by: keir.fraser@cl.cam.ac.uk

diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index 732809db07b4810e8981cf623bd9bc4f6455aedd..1fa6a0f0e5123d312d4b4a02435c1786b7ae6faa 100644 (file)
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -273,6 +273,13 @@ void arch_do_createdomain(struct exec_domain *ed)
     }
 }
 
+void arch_do_boot_vcpu(struct exec_domain *ed)
+{
+    struct domain *d = ed->domain;
+    ed->thread.schedule_tail = d->exec_domain[0]->thread.schedule_tail;
+    ed->mm.perdomain_ptes = d->mm_perdomain_pt + (ed->eid << PDPT_VCPU_SHIFT);
+}
+
 #ifdef CONFIG_VMX
 void arch_vmx_do_resume(struct exec_domain *ed) 
 {

diff --git a/xen/common/Makefile b/xen/common/Makefile
index 17b3b952e7fab2e4e6c211380a2111feffeb9dff..eb8d1b1f99863250e78e23629912564aa4d71395 100644 (file)
--- a/xen/common/Makefile
+++ b/xen/common/Makefile
@@ -6,7 +6,7 @@ OBJS := $(subst dom_mem_ops.o,,$(OBJS))
 OBJS := $(subst grant_table.o,,$(OBJS))
 OBJS := $(subst page_alloc.o,,$(OBJS))
 OBJS := $(subst physdev.o,,$(OBJS))
-OBJS := $(subst slab.o,,$(OBJS))
+OBJS := $(subst xmalloc.o,,$(OBJS))
 endif
 
 ifneq ($(debugger),y)

diff --git a/xen/common/domain.c b/xen/common/domain.c
index 37e23fc1a6681f2cb9ebea0ee95160df33019a6b..b2e6360ddcd62821052d1b7bca61922f0fe637f3 100644 (file)
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -330,9 +330,7 @@ long do_boot_vcpu(unsigned long vcpu, full_execution_context_t *ctxt)
 
     memcpy(&ed->thread, &idle0_exec_domain.thread, sizeof(ed->thread));
 
-    /* arch_do_createdomain */
-    ed->thread.schedule_tail = d->exec_domain[0]->thread.schedule_tail;
-    ed->mm.perdomain_ptes = d->mm_perdomain_pt + (ed->eid << PDPT_VCPU_SHIFT);
+    arch_do_boot_vcpu(ed);
 
     sched_add_domain(ed);
 

diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h
index d502f188713a5a0d581ec2830b5075342938f737..0e28badba03786633cceab0dbf9babde42a03f17 100644 (file)
--- a/xen/include/xen/domain.h
+++ b/xen/include/xen/domain.h
@@ -16,6 +16,8 @@ extern void arch_free_exec_domain_struct(struct exec_domain *ed);
 
 extern void arch_do_createdomain(struct exec_domain *ed);
 
+extern void arch_do_boot_vcpu(struct exec_domain *ed);
+
 extern int  arch_final_setup_guestos(
     struct exec_domain *d, full_execution_context_t *c);